From: Stefan Monnier Date: Thu, 4 Jun 2009 20:48:16 +0000 (+0000) Subject: (tar-header-block-tokenize): Obey @LongLink even for X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~493 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cddabe4a42cd0968098ed23c1faa558b865c660c;p=emacs.git (tar-header-block-tokenize): Obey @LongLink even for POSIX tar archives (bug#3410). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0cf4f8921d..651cd1c49a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-06-04 Stefan Monnier + + * tar-mode.el (tar-header-block-tokenize): Obey @LongLink even for + POSIX tar archives (bug#3410). + 2009-06-04 Johan Bockgård * vc.el (vc-revision-other-window): Fix argument to backend diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index 5da38db052b..e0c78c8b781 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -276,7 +276,10 @@ write-date, checksum, link-type, and link-name." (setq link-p 5)) ; directory (if (and (equal name "././@LongLink") - (equal magic-str "ustar ")) ;OLDGNU_MAGIC. + ;; Supposedly @LongLink is only used for GNUTAR + ;; format (i.e. "ustar ") but some POSIX Tar files + ;; (with "ustar\0") have been seen using it as well. + (member magic-str '("ustar " "ustar\0"))) ;; This is a GNU Tar long-file-name header. (let* ((size (tar-parse-octal-integer string tar-size-offset tar-time-offset))